From: Keir Fraser Date: Wed, 15 Dec 2010 12:09:41 +0000 (+0000) Subject: x86-64: fix restoring of hypercall arguments after trace callout X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c4232f36baa21ed5d1281fa21e4c7ddfa698aaa2;p=xen.git x86-64: fix restoring of hypercall arguments after trace callout Signed-off-by: Jan Beulich --- diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 05290484ec..70471ecfc6 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -160,8 +160,8 @@ ENTRY(syscall_enter) movq UREGS_rsi+SHADOW_BYTES(%rsp),%rsi /* Arg 2 */ movq UREGS_rdx+SHADOW_BYTES(%rsp),%rdx /* Arg 3 */ movq UREGS_r10+SHADOW_BYTES(%rsp),%rcx /* Arg 4 */ - movq UREGS_rdi+SHADOW_BYTES(%rsp),%r8 /* Arg 5 */ - movq UREGS_rbp+SHADOW_BYTES(%rsp),%r9 /* Arg 6 */ + movq UREGS_r8 +SHADOW_BYTES(%rsp),%r8 /* Arg 5 */ + movq UREGS_r9 +SHADOW_BYTES(%rsp),%r9 /* Arg 6 */ #undef SHADOW_BYTES 1: leaq hypercall_table(%rip),%r10 PERFC_INCR(PERFC_hypercalls, %rax, %rbx)